Skip to content

[main] Source code updates from dotnet/dotnet #11238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 6 commits into from
Nov 17, 2025
Merged

[main] Source code updates from dotnet/dotnet #11238

merged 6 commits into from
Nov 17, 2025
+99 −89

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Nov 7, 2025 •
edited
Loading

Note

This is a codeflow update. It may contain both source code changes from the VMR as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Updated Dependencies

  • From 11.0.0-beta.25555.103 to 11.0.0-beta.25560.108
    • Microsoft.DotNet.Arcade.Sdk
    • Microsoft.DotNet.CodeAnalysis
    • Microsoft.DotNet.GenAPI
    • Microsoft.DotNet.Helix.Sdk
  • From 10.0.0-rc.1.25555.103 to 10.0.0-rc.3.25560.108
    • Microsoft.Dotnet.WinForms.ProjectTemplates
    • Microsoft.NETCore.App.Ref
    • Microsoft.NETCore.Platforms
    • Microsoft.Private.Winforms
    • System.CodeDom
    • System.Configuration.ConfigurationManager
    • System.Diagnostics.EventLog
    • System.DirectoryServices
    • System.Drawing.Common
    • System.Formats.Nrbf
    • System.IO.Packaging
    • System.Private.Windows.Core.TestUtilities
    • System.Reflection.MetadataLoadContext
    • System.Resources.Extensions
    • System.Runtime.Serialization.Formatters
    • System.Security.Cryptography.Xml
    • System.Security.Permissions
    • System.Windows.Extensions
  • From 10.0.0-rc.1.25552.1 to 10.0.0-rc.1.25513.8
    • Microsoft.DotNet.Wpf.DncEng
Microsoft Reviewers: Open in CodeFlow

Associated changes in source repos

@dotnet-maestro
Backflow from https://github.com/dotnet/dotnet / 77ee357 build 289869
ae34219 
[[ commit created by automation ]]
@dotnet-maestro
Merge main into darc-main-a47906db-efa1-4e47-9ed9-9e48bda400e1
c9fe388
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 289869
8d94dfc 
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25555.103 -> 11.0.0-beta.25556.111)
Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25555.103 -> 10.0.0-rc.3.25556.111)
Microsoft.DotNet.Wpf.DncEng (Version 10.0.0-rc.1.25552.1 -> 10.0.0-rc.1.25513.8)
@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner November 7, 2025 02:09
dotnet-policy-service[bot]
dotnet-policy-service bot previously approved these changes Nov 7, 2025
View reviewed changes
Copy link
Contributor

@dotnet-policy-service dotnet-policy-service bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Go, you big red fire engine!

@dotnet-policy-service dotnet-policy-service bot added the PR metadata: Label to tag PRs, to facilitate with triage label Nov 7, 2025
@JanviMahajan14
Copy link
Contributor

JanviMahajan14 commented Nov 10, 2025

@mmitche , @ViktorHofer
Can you please confirm if the downgrade here is valid ?

ViktorHofer
ViktorHofer reviewed Nov 10, 2025
View reviewed changes
@dotnet-maestro
Merge main into darc-main-a47906db-efa1-4e47-9ed9-9e48bda400e1
05102a9 
Auto-resolved conflicts:
- eng/Version.Details.props
- eng/Version.Details.xml
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 290335
aaf129b 
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25556.111 -> 11.0.0-beta.25560.108)
Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.3.25556.111 -> 10.0.0-rc.3.25560.108)
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 12, 2025

Caution

There are conflicts with the main branch in this PR.
Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="02022b2fe7037ef7a4af4b899c6d2c2353f94196" BarId="290335" />

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 13, 2025

Important

The source repository has received code changes from an opposite flow. Any additional codeflows into this PR may potentially result in lost changes.

Please continue with one of the following options:

  1. Close or merge this PR and let the codeflow continue normally
  2. Close or merge this PR and receive the new codeflow immediately by triggering the subscription:
    darc trigger-subscriptions --id f1124ab6-1481-4f33-a146-eb9bc5b1b331
  3. Force-flow new changes into this PR at your own risk (some PR commits might be reverted):
    darc trigger-subscriptions --force --id f1124ab6-1481-4f33-a146-eb9bc5b1b331

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

harshit7962
harshit7962 approved these changes Nov 17, 2025
View reviewed changes
Copy link
Member

@harshit7962 harshit7962 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version updates, LGTM

@harshit7962 harshit7962 mentioned this pull request Nov 17, 2025
Closed
@ViktorHofer ViktorHofer merged commit 92841b9 into main Nov 17, 2025
19 of 20 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-a47906db-efa1-4e47-9ed9-9e48bda400e1 branch November 17, 2025 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JanviMahajan14 JanviMahajan14 JanviMahajan14 left review comments

@ViktorHofer ViktorHofer ViktorHofer approved these changes

@harshit7962 harshit7962 harshit7962 approved these changes

@dotnet-policy-service dotnet-policy-service[bot] dotnet-policy-service[bot] left review comments

@dipeshmsft dipeshmsft Awaiting requested review from dipeshmsft

Assignees

No one assigned

Labels

PR metadata: Label to tag PRs, to facilitate with triage

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@JanviMahajan14 @ViktorHofer @harshit7962